Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 2021 Aerials Screensavers and fix reported bugs #51

Merged
merged 9 commits into from
Jan 2, 2022

Conversation

kubedzero
Copy link
Contributor

@kubedzero kubedzero commented Jan 1, 2022

Hope all is well and happy new year 🎉

  • I checked in on the state of tvOS and Aerials and found that there were a bunch of new scenes.
  • I checked the https://sylvan.apple.com/Aerials/resources.tar file but didn't see any updates, meaning it's identical to the file currently committed from early 2021 in this codebase (and customized with deprecated H.264 and other videos)
  • I did some looking around and figured out that https://sylvan.apple.com/Aerials/resources-15.tar has updated JSON once unpacked, over 1000 lines more!!! I guess they're appending the tvOS version number now.
  • Differences in the new tarball
    • At the top level, the old file had an assets array, the initialAssetCount key, and the version key. The new version has a categories array
    • Inside each of the items in the original assets array (where we source the video URLs) had pointsOfInterest, accessibilityLabel, id, clipNumber url-1080-HDR, url-1080-SDR, url-4K-SDR, url-4K-HDR, url-1080-H264. Now there is a categories array and a shotID, and the clipNumber is no longer used. They seem to differentiate based on shotID and ID alone now, with the accessibilityLabel being the same between them

I took these changes and merged them into the local entries.json file, and also updated the URL to point at the latest version of the Resources tarball. Along with this, I updated the toggle settings to cover missing locations (and the new locations) and added a big block of translations for all three languages as well.


I also checked the issues folder:

Testing

  • Ran the entrychecksumgenerator.py 2 to confirm the resources.tar file can still be downloaded from Apple, and that the entries.json can be retrieved from inside it
  • Ran the entrychecksumgenerator.py 1 to test downloading all videos. I validated that the MD5s matched from the original checksums.json from 2021, so any pre-existing URLs have been validated to retrieve the exact same content as before.
    • I also validated that this script downloaded the full set of 116 videos each for 4K SDR, 4K HDR, 1080p SDR, 1080p HDR, and 122 videos for 10800 SDR H.264 for 586 videos total
  • For testing within Kodi, I tested on Kodi 19.3 Matrix on MacOS 12.0.1 Monterey, as well as Windows 10 1907
  • Feel free to test locally for a while before merging, I'll be doing the same and will update this PR if I find any issues.

@@ -1,5 +1,3 @@
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/e5d8dc168cf940a385d1a47837fe7596)](https://www.codacy.com/app/92enen/screensaver.atv4?utm_source=github.com&utm_medium=referral&utm_content=enen92/screensaver.atv4&utm_campaign=Badge_Grade)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This link was no longer working, I'm not familiar with Codacy but it gave me a 404 when I tried to go here.

@kubedzero kubedzero marked this pull request as ready for review January 1, 2022 20:58
@graysky2
Copy link
Contributor

graysky2 commented Jan 2, 2022

@kubedzero - Trying your PR now, seems to be working (downloaded 25 new vids) bring the total to 273. Interestingly, I could not apply this PR directly to v3.0.2 because that tarball lacks entrychecksumgenerator.py

I think it's due to https://github.com/enen92/screensaver.atv4/blob/master/.gitattributes#L9

@enen92 - Do you want to remove that line?

@enen92
Copy link
Owner

enen92 commented Jan 2, 2022

@graysky2 that line is important since the file is not to be pushed to the repo when archiving the add-on.

I'll tag a new release shortly, thanks very much @kubedzero

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants